bitkeeper revision 1.1159.168.3 (4195db072g989tWZuoaN1ovNwoEBjQ)

Declare evtchn_do_upcall with asmlinkage for CONFIG_REGPARM.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
index 28dca535d9983141ebf99350a00ef5880f54f63c..0041caa9bf7182df07cfc020775d0303d36974c9 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
@@ -82,7 +82,7 @@ void force_evtchn_callback(void)
     (void)HYPERVISOR_xen_version(0);
 }
 
-void evtchn_do_upcall(struct pt_regs *regs)
+asmlinkage void evtchn_do_upcall(struct pt_regs *regs)
 {
     unsigned long  l1, l2;
     unsigned int   l1i, l2i, port;

diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
index bf2732126327320b803ae8a2ef4deb5e6211e312..a4930a09d577939f5402e190c378668ef12d0bb7 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
@@ -48,7 +48,7 @@ void force_evtchn_callback(void);
 void evtchn_do_upcall(struct pt_regs *regs);
 
 /* Entry point for notifications into the userland character device. */
-void evtchn_device_upcall(int port);
+asmlinkage void evtchn_device_upcall(int port);
 
 static inline void mask_evtchn(int port)
 {